stubdom: Fixes for gcc 4.2.4 32bit

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h
index 8d0d6f8ea9e007d4d8c453fb08d88289aaef36ed..19b730280d3892bf059caa69f6da6c00f1117aac 100644 (file)
--- a/extras/mini-os/include/types.h
+++ b/extras/mini-os/include/types.h
@@ -89,6 +89,5 @@ typedef intptr_t            ptrdiff_t;
 #ifndef HAVE_LIBC
 typedef long ssize_t;
 #endif
-typedef unsigned long size_t;
 
 #endif /* _TYPES_H_ */

diff --git a/extras/mini-os/pcifront.c b/extras/mini-os/pcifront.c
index 9f40081758fe31404a149227bf2e2ea73d8abe69..a924a6e8d9c13598afdcdaabf8eaff98237a9c79 100644 (file)
--- a/extras/mini-os/pcifront.c
+++ b/extras/mini-os/pcifront.c
@@ -216,10 +216,10 @@ void pcifront_op(struct pcifront_dev *dev, struct xen_pci_op *op)
     dev->info->op = *op;
     /* Make sure info is written before the flag */
     wmb();
-    set_bit(_XEN_PCIF_active, &dev->info->flags);
+    set_bit(_XEN_PCIF_active, (void*) &dev->info->flags);
     notify_remote_via_evtchn(dev->evtchn);
 
-    wait_event(pcifront_queue, !test_bit(_XEN_PCIF_active, &dev->info->flags));
+    wait_event(pcifront_queue, !test_bit(_XEN_PCIF_active, (void*) &dev->info->flags));
 
     /* Make sure flag is read before info */
     rmb();